From 8383f003f3e3497d5a220f07850347d8462969c5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 20 Aug 2013 00:14:00 -0400
Subject: [PATCH] Avoid deprecation warnings

---
 gtk/gtkcombobox.c | 10 ++++++++++
 gtk/gtkmenu.c     | 12 ++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 7ae1321629..b4381ac9ea 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1164,7 +1164,9 @@ gtk_combo_box_set_property (GObject      *object,
       break;
 
     case PROP_ADD_TEAROFFS:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       gtk_combo_box_set_add_tearoffs (combo_box, g_value_get_boolean (value));
+G_GNUC_END_IGNORE_DEPRECATIONS;
       break;
 
     case PROP_HAS_FRAME:
@@ -1187,7 +1189,9 @@ gtk_combo_box_set_property (GObject      *object,
       break;
 
     case PROP_TEAROFF_TITLE:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       gtk_combo_box_set_title (combo_box, g_value_get_string (value));
+G_GNUC_END_IGNORE_DEPRECATIONS;
       break;
 
     case PROP_POPUP_SHOWN:
@@ -1281,7 +1285,9 @@ gtk_combo_box_get_property (GObject    *object,
         break;
 
       case PROP_ADD_TEAROFFS:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
         g_value_set_boolean (value, gtk_combo_box_get_add_tearoffs (combo_box));
+G_GNUC_END_IGNORE_DEPRECATIONS;
         break;
 
       case PROP_HAS_FRAME:
@@ -1293,7 +1299,9 @@ gtk_combo_box_get_property (GObject    *object,
         break;
 
       case PROP_TEAROFF_TITLE:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
         g_value_set_string (value, gtk_combo_box_get_title (combo_box));
+G_GNUC_END_IGNORE_DEPRECATIONS;
         break;
 
       case PROP_POPUP_SHOWN:
@@ -5074,8 +5082,10 @@ gtk_combo_box_update_title (GtkComboBox *combo_box)
 
   if (combo_box->priv->popup_widget &&
       GTK_IS_MENU (combo_box->priv->popup_widget))
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
     gtk_menu_set_title (GTK_MENU (combo_box->priv->popup_widget),
                         combo_box->priv->tearoff_title);
+G_GNUC_END_IGNORE_DEPRECATIONS;
 }
 
 /**
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index e0e58b703b..6a4f01eb60 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -918,10 +918,14 @@ gtk_menu_set_property (GObject      *object,
       }
       break;
     case PROP_TEAROFF_STATE:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       gtk_menu_set_tearoff_state (menu, g_value_get_boolean (value));
+G_GNUC_END_IGNORE_DEPRECATIONS;
       break;
     case PROP_TEAROFF_TITLE:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       gtk_menu_set_title (menu, g_value_get_string (value));
+G_GNUC_END_IGNORE_DEPRECATIONS;
       break;
     case PROP_MONITOR:
       gtk_menu_set_monitor (menu, g_value_get_int (value));
@@ -958,10 +962,14 @@ gtk_menu_get_property (GObject     *object,
       g_value_set_object (value, gtk_menu_get_attach_widget (menu));
       break;
     case PROP_TEAROFF_STATE:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       g_value_set_boolean (value, gtk_menu_get_tearoff_state (menu));
+G_GNUC_END_IGNORE_DEPRECATIONS;
       break;
     case PROP_TEAROFF_TITLE:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       g_value_set_string (value, gtk_menu_get_title (menu));
+G_GNUC_END_IGNORE_DEPRECATIONS;
       break;
     case PROP_MONITOR:
       g_value_set_int (value, gtk_menu_get_monitor (menu));
@@ -2183,7 +2191,9 @@ gtk_menu_update_title (GtkMenu *menu)
       const gchar *title;
       GtkWidget *attach_widget;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       title = gtk_menu_get_title (menu);
+G_GNUC_END_IGNORE_DEPRECATIONS;
       if (!title)
         {
           attach_widget = gtk_menu_get_attach_widget (menu);
@@ -2226,7 +2236,9 @@ static void
 tearoff_window_destroyed (GtkWidget *widget,
                           GtkMenu   *menu)
 {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   gtk_menu_set_tearoff_state (menu, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS;
 }
 
 /**
-- 
2.30.2